Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable default features for aws-lc-rs #286

Merged
merged 1 commit into from
Aug 1, 2024

Conversation

daxpedda
Copy link
Contributor

Rcgen doesn't require aws-lc-rs's default features, so disabling them removes some dependencies.

Copy link
Member

@cpu cpu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM mod fixing the build. Thank you!

Cargo.toml Show resolved Hide resolved
ring = ["crypto", "dep:ring"]
fips = ["aws_lc_rs", "aws-lc-rs?/fips"]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed the ? because it didn't make sense, or was it there for a reason?

Copy link
Member

@cpu cpu Jul 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you're right that in this context it doesn't make sense and should be removed. My understanding of the ? is that it (docs):

"will only enable the given feature if something else enables the optional dependency."

But in this case, the fips feature is activating aws_lc_rs right alongside aws-lc-rs/fips.

@djc Does that match your understanding? The usage came along with #234 and wasn't discussed explicitly as far as I can tell.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIRC there was a bug in older Cargo versions that needed the ? to be there. If it works without it on the project's MSRV, I'm fine with this.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried it locally with Rust v1.66 and it compiles for me.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"aws_lc_rs", "aws-lc-rs?/fips" is the new way of writing "aws-lc-rs/fips" and makes it explicit that the enabling the aws-lc-rs feature is vital for the fips feature.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this case I don't think it makes sense to preserve the ?, since we unconditionally enable the optional dependency anyway when the fips feature is enabled.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this case I don't think it makes sense to preserve the ?

I agree. Since @est31 didn't request any changes and approved the PR I think it's fair to merge with the removal?

@daxpedda daxpedda requested a review from cpu July 30, 2024 20:57
@djc
Copy link
Member

djc commented Jul 30, 2024

Seems surprising that support for -sys is optional in aws-lc-rs?

@daxpedda
Copy link
Contributor Author

Seems surprising that support for -sys is optional in aws-lc-rs?

AFAIU the choice is between aws-lc-sys or aws-lc-fips-sys (exposed as the crate feature fips).
Compilation will fail if you don't choose at least one.

@cpu cpu added this pull request to the merge queue Aug 1, 2024
Merged via the queue into rustls:main with commit 178ee6b Aug 1, 2024
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants